Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 7 May 2010 22:41:48 +0000 (22:41 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 7 May 2010 22:41:48 +0000 (22:41 +0000)

Trivial merge